More work on packaging