Adapted to changes as of 13 jan 2013.