fields changes to fixed some functionality issues