(re)add tasks from sbrink