Added extra steps