slight updates in preparation for team work