improvements to package 2