Updates to modeling from Rick