5th Commit: A few features added