Further work on deploy