Think I have a better way to do this