applied some inlining
applied some inlining