Renamed filed and small tweeks