* Hude improvements of entire logic