Updated Class

Removed old code, put in new code.