Second commit for proper work on animerom