Change TODO place