updated for came == false