It has extended its considerably over the last few years moving northwards along the Pakistan-Afghanistan border , from South Waziristan to North Waziristan to Bajur and across now to Swat and Buner .