Wired up edit for #155