It is a good idea, but we should make a separate ticket for it.