Few more modification after merging.