now with prepack support