Update based on recommendations by @SomeoneWeird.