added some TODO fields