Bugs Fixed
change structure