Updating code for b6 and adding new code for updates