Fixed slot counting and added delay support