Improved dependancies so that installing does not happen over and over if not required.