More tweaks to make the new IP system work
Added new model
Merge