Working version

I hope.