subdir option added