Updated version to account for latest changes