ellinet additions to last commit