Simplifying to Aidan's suggestion