fixing model structure