* updating master with refactored tour