JJ knight and ace era - edits #13