prepare switch to Frank
Prepare for Frank
merge predef steps