merge rich's changes for great success