edit to Rory post