all changes included