Update code to version 2.4.0