make button works
merged