add conditions to disallow shortcuts