this and all the dittos fixed