Changes to make this installable