WIP evil temp fixes