Now it works even better