Additional commits to improve efficiency