some changes from Marc nek branch (reduced waiting)