ditching the custom hierarchy