Rewrite with no byte level calls