Updated more code