some model and controllers changes