Big changes by Kúri and skassi
xxx