Upgrades from the twitter post part 2