Another Czaplicki's suggestions
State and Doc Brown changes