Trying to improve deployment speed