Academy updated code 27 nov 2014