Preparation 2.4.2 and 2.4.3

Updated model