Merging in MA
Add sdf environment
Fix use in MA