Updating some final stuff