Added FidMarques and removed Shopwise+NoMaggot