Changes on 14/10/2013 by Albert