Danila's changes