re-implemented doctrin entities (loss of data), reseted variables.less