working iOS 6 impl, ship it! (added funcs to both impls)