Signed-off-by: Byvirven <dossantos@ebu.ch>
Refactored version