(though if it's just these two fields i'm ok leaving it)