more changes related to the most recent package additions