add animation + finetuning