Fixed content assist, needs cleaning up