now working ok first version