updated for 2013-06-14 and 2013-06-21