Updates from my fork