updated rest of code to align with new obj model