reworked substitution models