Added some stuff. Read the diff, yo.