Updated models with comments from Damien