added delay support