CODE REVAMP ACCORDING TO LOCAL