Deployment algorithm improvements