simplifying more stuff.