Make it right before you make it faster