Added new bugs here