changes for the latest lambda