- finished changes for performance analysis