2.05.0:zeress:8 Partial fix for 90

- Added some weighting