still fixing error handling