Updated version to reflect latest code