Ninja / CentComm changes