Functionally the same code as before, but cleaned up a bit