finally working ok