Updating working version