add changes from 08/11/2013 at work