Revert ce46d61..a730f58

This rolls back to commit ce46d61c7aad954e085233b431ffb5533e09d84c.
Revert 6c12213..26be330

This rolls back to commit 6c12213550bdd531b453e135f24cc299ba1ee174.
fixed term wighting
merged