minor
work on unfolding new implementation