Merged new features