Internal TODO closed (sry for second commit)