Original functionality with faster animation