I don't like this approach. I'm going to change this