This could have been in a separate commit