Now works much better