added closures to all true to allow proper short circuiting