taha's 2nd commit