made correct changes for todos