fixxxxing
look changes, not perfect, open to chenges