Added Aidan's changes