Some minor changes... ;)