Updated to Constellation 1.5