merged changes by Jimmy