[WIP] advance sample on internals rewrite