scaled back changes after comments from nbauernfeind