Working on the OCT class