Updated for Prot and main fields