Changes on 12/10/2013 by Albert