Revised licence logic