adjustments to match drupal fields, commented out weekend for now