added --local support
updated