Change logic for OWPS team competition again