19/11/2014 can be deleted after class