Updated to the working version