minor changes, preparation for more