Tweaks to match aws. and remove initialization to "ROGER"