changed model signatures