minor changes to accompany new change