Small changes to make more suited to my scenarios
No more twitter.