Improved the installer