work towards AI fixes