merge marc's new features