enchance model and function [ongoing..]