Work in progress - aligning with native implementation