i don't know if it's good, trying to merge correctly
save
fixed some bugs before rubinshtain