changed model to prevent conflict