Increased Button performance