The most of TODO fixed