changes after Vita's review