Add small tweaking
Finalized the first draft!