updated basemodel