Updated regex to match weights better