More model based code left commented out.