Commit 2

Lots of stuffs