Merge & Fixes

This model should not be deeletd.