Atif's changes