Yea, better than previous version