Migrated to data watchers

they are a bit more flexible and useful