Some edits for testing and to match Alix