add changes from May 19, 2014, at 08:09 AM