Adding the latest code
Changes according to the latest version