renamed fields added by vaibhav too