YARA (Yet another re-arrangement)