Merge Ai baxter to fix indentation and the sort