change all handler to static handler