Taking SUBFOLDER into account