Added code
Changed todo and warning