End of class update 24/10/14