Changed to include all assignments