updated for pkg style