new features merged from other projects