Tweaks to original repo