Tried to reconcile last changes