updated from new scaffold layout