WaitForFrame & waitForAttribute added