Final version without extra messages