E-cigarettes, shisha to be illegal from Feb 1 under amended Tobacco Act