Changes by r on 21/10/14