akwehfas
Fixed the bugs
Merged changes