Updated to Massive refactoring