Updating for version 2.4.0