New attempt by removing the animation class