removed attachment from hot tour
refactoring and redesign