re-did some fix lost in reset