This looks a bunch better now