market model and controller fixed