added Yasmine's model