should now work even better