fix bugs
ne eebu
new model