removed set interval() and added tables