Last changes in code