added skip
added other parameters to where invocations