Added few bugs