6/14/12 by Adam - changes committed