Added animation and proper arrows generating handling.