keep seeing better ways to do things so here is yet another update