Added a new bug; added new feature