move to model
fix stop