A few changes, here and there :)