Upgraded with user tweets