fixes + new structure