Added animation and stop