Refactors and add wepp: