Tweaked to get master working