- Switching to OO paradigm