changes from mchan 17/5/2014