Fix view + add Tristan's code