merged Yuans Hypo changes from Auto to Auto2