Refined the class, kept copy of working development class
Commit changes