More work to desktop package