Improved deploy