re-working, simplifying