reconfigured to allow tests to pass. Need more research