Ok, I can do that as a separate task.