cleaning up, changing constraints