solving all the issues arnaud created