added comment about future refactorization
use skip_all instead of renaming