Last changes for .5