Updating code. 70% done