small changes to prepare for bigger ones!