updated deprecated handler