re-added code from prior checkin