minor changes from last commit