fixing model
grr
?