Add new spec + plus refactoring of the varaiable