these two are working but could be cleaner
this seems to be working