Last changes to the code