This whole handler thing is something I am eliminating in next "update" as we are changing configuration a bit also this will get redundant.