Latest changes from Azilroka & Sortokk