Refactored edema according to client specifications