Real first version

I made a mistake earlier and reverted that, but here is the actual
version, there still are the apparent errors