updating with master
possible soultion for reset button