adding changes back after merge, changing http status code returned