use better paths and use new capture method