#85: Updating code