Updated according to Tobi's comments.