all the latest changes included