merged Mike's register edits