Made it more me-friendly