merged changes with team recognition changes