Perhaps better in a separate PR?