cleaned up artificial divide between dynamic and normal settings, now all normal