almost final version
fix conflict in fb.js