HSS more changes