updating my fork to include all original updates