Rm6299

RM6299 changes
These can also be stored in __init__