changed to pass tests