some changes with wrappers