This looks quite clever now :)