Zohaib fixed errors