Maybe we can add a task for this