Button2 Further tweaking