Ahmed's 2nd commit