Tested and updated

Fully functional