add minimized fonctionality, should be improved