Change with respect of the fact that data is always saved