Adding Changes From Version 2.3.4