pruned all thor code
merged conflict