more changes for performance