Margin Engine Improvements