updated for 2012-07-12