Second commit in dev_shahid