Reset button working, everything else is the same