OL2 and OL3 now together