master - NEW: trying to clean this up a bit