Take care of TODO