updated angular and small tiny change to rejoining