better handling of dynamo events