small changes, no additional functions, only for codex