Latest version into master

There are a lot on modifications from the last time we have done this