design changes and rescue from crash