more changes made according to what TA explained us