wip update guide with options and waiton