Change Title / changed TODO statments