Added 2 more points in TODO