after some fwe fixes