Optimization edits