Working version; reverted from team creation