getting rid of watch functionality