made this better