Open source updates

tong