Switch previous commit to use hashes to make it more maintainable