commit with core logic 12/11/2014