Merged all. Issues with rejoining to be looked into by Liu