fixing reset and robusting change