Assistant changes for final simulation - added again because of merge overwrite