Improved Installer

Improved Installer