Added strcant and TODO