revamped the installation a bit