start on record control
mostly record control related changes
resolve merge conflicts