Add MJO stuffs and make a lot of changes