Functional
proper z index
ident hotfix