Medusa Refactor/Matiaskpo09