Made this a lot nicer