new version, with a few fields and some another changes