Think I found a solution