performance enhacements