23/10/2014 now working, commented out a line