Last commit before restruct
deleted