test branch
fixed shortcuts