Some more changes to make it better.