Made some changes to make our implementation less write intensive