some changes were made by user1