updated oop, and modified build