Add more verification steps, not working yet.