Fixed weighting, requirements
Cleaned up notation