Upgraded OG to 2.x