Added animations, tweaked attr