Added weight goal logic