Last changes for completion