Eh. minor change (very early prep for GUI)