Added to more files

OPP and OPP2