Worked on some updates
Moved to another place