Moving from 2.4.0 to 2.3.0 due review