Transfer improvements from private repo to public