Added Tristan's code manually 'cus I'm a git failure