more tweaking, simplifying