Tour II additions - Revert, pulling it together