Modify to pass tests