aligned with solutions branch