Updated to illuminate/support 4.1.x