Updated onlyif with a second form
Implemented #6