merging with daniel changes