more packages and changes