TODO included and *& changed to **