addapt recently made SHM restructre