Minor tweaks. Planning