Maybe these changes should go in a separate PR?