Adhere better to aidan's style