change fields to obj and add edit hajj