minor changes for sync up with Victor