Changes to use glob function :+1: