Add comment
Tweak behaviour