Added option for temporal delay
Minor changes