Merged Model with master