fixed to use new pkg