removed debugging parameters