Update my fork with latest changes