better treat handling