minor changes for optimization