Fork update

Updating my fork to match changes