Agreed, I vote for the second option :)