Adding latest changes to fork