Modified to use pre-packaged box