Added back timeout and interval funcs