update after crater refactoring