Added L12 to OOP
Added L8 to OOP