My last version... fixing bugs...