Changes I should have made before