Changed problem structure