Updated for merge issues.