big change fix all fileds