added some additional TODO rules