last minute changes, now it works :)