Made installation much simpler