ticket:3 make some changes to work with FB