aug17 from master with facebook

Ii think we are on track