Added all changes