More work on simplifying things