Implementing Lorraine and Spyros edits