Updates to comply with tweet code