lets do this a better way