Small changes to balance and standup
merge conflict