Moved the add good/bad object calls