@asheepapart - can you modify this according to @byxorna's suggestions please?