Optimized to install first and fore upgrade after