new fixes WIP