New update HUGE thanks to Kain