Updating for simpler installation and usage