merge with daniel changes