some changes for LambdaJam