performance and logging related changes