changes from david y1 and micah to prototype - 29 apr 2013