Upgrades from the twitter post part 3