Renamed first assignment and added current assignment