adjusted some fields from double to int