Refactoring, need to upload new oeall22 asap