small modernization
leverage cheap snapshot