bug fixes in prc
merged changes
merged changes