Switching back to simplistic Compose
Rebuild Ran and Lan based on their universal properties