6/16/2014 commit . . . Major improvements