Improved install (half-working)