Yeah, I'd prefer a separate PR for any behaviour changes