making this a lot simpler