Added oef 5-18:20, 6-1,6-2