Added two buttons - for demo will be tweaked later