minor changes from sunday night -.-