Commit 2 some fix..