Switched to OOP for production