Made changes to aid Twitter to user changes