modified to use full path