First commit
fixed bugs
Removing unnecessary data