Minor changes luke made :P