Added Spad with button sets