Added some more bug!
merging bug1