Changes made on class 27-12-2014