Added Version checking - also removed debug text