Tweaks to working version before I move to Jafar's Model