more package level changes