added Timer. not yet tested