Mr1 staging

Please take a look at this change along. It fixes my issues.