Changes for the comptetion v1