Lots of changes to incorporate FB login