adding sctrict mode support