Re-add auras - needs some cleanup