Import changes that were made in private repo

Public once and for all!!!!111!!