Removed z as folder enhancement