I like this naming better