merged changed from stephano