Pulling Scanno's changes