another round with new buttons and switches