update to use perconnection handler