o2 helpers added