Sorooshes remaining changes commited