modifications. sometimes get 500 errors, sometimes it works