MEDIUM / Improved some stuff