few changes to oops