after removing unnessesary functions - Shahar review