Code update to v2.3