lots of changes
Merge branch 'fb-blip'