Added a bunch of stuffs for Michael.