[WIP] First draft of improvments