Now works even better than before