Last changes, this version will not be develope anymore