i think that's much better and have added it with one minor change