Last changes for final code