My latest code

Do not really know what I have changed since the last commit....