Updated necessary fiels as requested in pullrequest.