updated for subdir