Debug Model to Short function and fixed other bug