some structural improvements for better evaluation