changed field order and removed file field