can be const... now is
can be const... merge from master