now working ok