asheerbad :Fixed errors after testing