redesign code to improve performance (ongoing)