Changes on field according to Mike's requests