make some changes; need to resolve UFunc slow problem