This would be a really nice feature