Adding suggestions from andygrunwald. thx