still need to fix the reset bug