works much better now