I wanted to stay consistent to eventually get this upstream