Inlined those functions again