updated for building package