General modifications

29/10/14