integrate latest stuff