Finally made it work