Ah, and moved comments as well :)