Changes to make it a bit easuer to install