Changed TODO notes