Issue #LOOP-95 by tj: Added weight