added local support