cleaner! but still more to cut away...