yh-261 drupal debugging
yh-261 debuggin more
yh261 merge
yh-261 fixed refactored bug