Fixing heirarchy to match standards