Integration Code fixed + Latest version fix