small restruct, progress