Modifications for simplicity and performance.