Awesome improvements for the next version\