minor changes, no ideas about comparable, still