integrate latest developments