remove this code altogether, update intervals do not belong here