more packaging and configuration