Merge more important additions