04-09-2014 Changes

Controller and model modification