Actually I think I have a better solution. I will try that and push it once I tested it