initial changes from drupal integration