add skip conditions