prototyping some improvements