Now works better