Updated - Reset logic added