Review by core: Added add last comments with todo's