More work on deployment