saving state
all ron's changes
R&R big bang merge