Seems more complicated that it needs to be