make things reasonably simple (again)