changed references to common data