added Razan suggestions