Merging with latest developments