Updated to the latest changes