Added compulsory code