remake with correct configuration