merged with the standalone module