I wondered if there was a better way. I can change it to do the above.