change request codes etc
merged
merged