merged lesslies changes with joses