A primary version

I tried to fix the bug