Changes to this code
Again more changes