added source tag, and adopted tags to new processin