updated to Kojo's stuff + weights included