completed migration to long from int