Made this better