Yes, this would be more user-friendly