restructure, added scale, added hyst