Now works rather well