static handler improved