Usefull changes from Andy