This is an update as 11/23/2014 at 20:23PM
Updated version as of 20:26 11/23/2014
Committ additional changes