Updated to integrate with facebook