add location assignments back in