template and handler changes --KW