corrected locals to keep in req scope when appropriate