some changes were made by user2