more changes for rebarization