Work on verify & animations