Probably working but save and load must be readapted