Makima new version

Hmm, looking at the old version and felt it was awful, my mind wasn't in the right spot during that period - I made so many mistakes, spent some time to fix it today :)