deleted Will and used Handler instead