Bringing in updates from MOD Design