align file with revampmarkov branch
align files with revampmarkov branch