Adding changes per janhartigan's request for PR