Major updates

27/02/2014