changes after @Dotile