Adapted for changed button setup