Restoring the working version