changes in setup, error handling