cleaned, animation improved