Could you send a separate PR for it?