Rm6299

RM6299 changes
probably shouldn't copy/paste the comments from others :snowman: