modified constants and typedef structs