Do we still need this commented part?