Button states change using temporary tools and code simplification